Auto merge of #1348 - alexcrichton:rustup, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 24 Feb 2015 19:57:32 +0000 (19:57 +0000)
committerbors <bors@rust-lang.org>
Tue, 24 Feb 2015 19:57:32 +0000 (19:57 +0000)

Trivial merge